Merge pull request #1350 from sfackler/master
authorAlex Crichton <alex@alexcrichton.com>
Wed, 25 Feb 2015 04:32:06 +0000 (20:32 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 25 Feb 2015 04:32:06 +0000 (20:32 -0800)
commitefe9826839269bd9633ab7796e9c01ab54e81ead
treeedbecb85ce38b4925d01c1df6772cd2b4ace0f7a
parent844a06085f42bd7aee34b4bffc25910dab30d620
parent7620c3ef87375a1702fc133aa670972ab8d45c03
Merge pull request #1350 from sfackler/master

Don't time out after 0.006 seconds